Merge "Sandbox only if an activity may enter size compat mode." into sc-dev