Merge "Clear mInheritedCompatDisplayInsets when clearing size compat mode" into tm-qpr-dev