Polish layout configurations
am: d06f51dc5f

Change-Id: I3bc59bbc19293978c8f8370c7353a6cbbab6c62f