Merge "PIP: Use StatusBarService to handle PIP key"