Merge "Don't perform layout while adjusting displays/stacks state." into mnc-dev