Merge "Remove usage of hidden API in System UI"