Merge "Colorpicker: add a proper landscape layout" into p9.0