Merge "Revert "Refresh opacity and statefulness on tint change"" into oc-dev
am: 61117c61d7

Change-Id: I77085a9cc1465d4c4295e5a6b666b677aec6ce25