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

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