Merge "Save/restore view states when reapplying RemoteViews for color changes" into sc-dev