Merge changes from topic "am-599cbaad1a6e4dbea89840bd93cf8505" into tm-qpr-dev-plus-aosp
* changes:
Merge changes from topic "am-d860aeb1f4184ec4b358c442e876df1c" into tm-dev-plus-aosp am: ffab94b6 am: e1224ca4
Merge "DO NOT MERGE: Downbranch merge conflict [Output Switcher] Fix situation when icon is not available for getBitmap" into tm-dev am: d0225df0 am: 3cfcba7c am: 27d5f19c