Merge "Update status bar icon policy for volume + zen."