Merge "Remove old logic from tinting prototype" into qt-dev
am: 60f7cef62b

Change-Id: I915fedf16f43a6a52f58e12e19e697cf3efb8ddc