Fix layout after cleanup

Closes-Bug: #1307183

Change-Id: If2c53f169db2ce3734d7edccb8842c90f228f04c
Merge "Fix layout after cleanup"