Merge "Integrate DisplayLayout for One handed mode" into sc-dev