Merge "Fix bug that caused task to show behind keyguard" into sc-dev