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

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