Merge "Always override screenHeightDp and screenWidthDp" into 24D1-dev