Merge "Controls UI - Remove BIND_WAIVE_PRIORITY" into rvc-dev am: 5258155a am: 1057ead8 am: 07502f7b Change-Id: I97967749e80dc4f094da06531e3ca6691f4b99aa