Add layout-land color picker
Merge remote-tracking branch 'aokpzmod/jb-mr1-mod' into jb-mr1-mod