am f7ba3037: am 9998300e: am 9c3601ca: Merge "Fix AppBarLayout not being drawn after rotation DO NOT MERGE" into mnc-dev

* commit 'f7ba30375d2a1865f76e889d953df251f2b2f2da':
  Fix AppBarLayout not being drawn after rotation DO NOT MERGE