Merge "Only update mAboveInsetsState when necessary" into sc-dev