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

Change-Id: Ifcece4a0de839bd19c6d8bb6660430580163d968