Merge "Decouple ForcedResizableInfoActivityController from SystemUI"