Tinted: Sort out derp from early DU patch and fix FC on tablets

Change-Id: I7d4fb6f492f3ca07fa86b3f199744f38485f7923