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

* commit 'cbacd4f0cee10b63adf6e2d482e7b4f62c0104a0':
  Don't perform layout while adjusting displays/stacks state.