Merge "Refresh opacity and statefulness on tint change" into oc-dev am: 265dbc1f09
am: 1148bc819a

Change-Id: I76faf6d25666c1b5612c009cfd9081465f319589