Merge \\\"Ensure that the tint is properly applied in docked mode.\\\" into nyc-dev am: b1f3404f8f am: e7796966ac
am: 200c3641d8

Change-Id: Iacd4c4fbad98736031b59386337b22a1ac43f795