Merge "SysUI: Use SBN keys instead of IBinder keys"