Merge "Update widget manipulation colors to match AOD." into sc-dev