Merge \\\"Ensure that the tint is properly applied in docked mode.\\\" into...
Merge \\\"Ensure that the tint is properly applied in docked mode.\\\" into nyc-dev am: b1f3404f am: e7796966
am: 200c3641
Change-Id: Iacd4c4fbad98736031b59386337b22a1ac43f795