Merge "Fix NullPointerException on mAppCompatDisplayInsets" into main