Merge "Fix letterbox in fixed rotation transform" into rvc-dev am: 711ba26816 am: ff5e1ce454 am: 61586c0194

Change-Id: I82c46e3fd261eb9862d51b574216a0f2d201e7bd