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