Merge "Merge "Update taskbar background color." into tm-qpr-dev am: 44665068" into tm-qpr-dev-plus-aosp