Merge "Merge "Force pinned windows to always be scaleable." into nyc-dev am:...
Merge "Merge "Force pinned windows to always be scaleable." into nyc-dev am: e67960ec am: f649dc35" into nyc-mr1-dev-plus-aosp
am: 3b40852d
* commit '3b40852d':
Change-Id: I2904e93acd0ffdc1c6c0788e64a0542bdf3f3d42