Merge "Use the primaryDisplayRotationFlags for the source crop calculation" into tm-dev