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

Change-Id: I16f52d3dc55861bdbc9813a5ea2bf91f24eabf87