Merge "b/3065363 updated selection color per designer's request. Do not merge" into gingerbread