Merge "Block service bound by foreground app to launch background activity by default"