Merge two Properties blocks in DesktopContext

Change-Id: I209e20c0ccd660218d3c65d716d35fb80ab84de9