Merge "Prevent NullPointerException in ActivityRecord when in Size Compat Mode" into tm-qpr-dev