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

Change-Id: I6dd0f84c4ec9f2cfe72d3e2f7d1ffce5b8a11ed4