Merge "Fix NPE in ActivityRecord.inSizeCompatMode()" into sc-dev