Move layouts

Test: manual
Fixes: 180747225
Change-Id: I437024328998feffcf5c3aceaaa863fa3eff1580
2 files changed