Merge "Merge "Chooser custom actions API." into tm-qpr-dev am: 6b5f62cac0 am: 7dfc70d66b"