Merge "Add null checker to AppBarLayout" into sc-dev