This reverts the revert in commitc44368016a, thus reapplying27315acfbb. Also fixes the bug that was the reason this needed to be reverted and fixes a case where the order was not correctly updated (landscape to seascape or vice versa) Fixes: 29612635 Change-Id: Id51cf7edaeeea16cba08bcd5a30313f58fa00d4d