Merge \\\"Ensure that the tint is properly applied in docked mode.\\\" into nyc-dev am: b1f3404f8f am: 702bf7407c
am: 7248d30600

Change-Id: I68092c3c8c986c8de80e919346fb31c753a835c3