Merge "Don't apply hard coded vertical metrics if target SDK is 35 or later" into main