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

Change-Id: I60d795b21f9a5a2b0f2555e959607a8dfefa7e9f