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

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