Merge "fix CAB mode not working when launched from widget/notification"