Merge "Fix Properties CL UI issue"