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

Change-Id: If2a7eec78b88c07a61c1109f2e3ce11339f86b8f