Merge "Disable immersive mode confirmation when device is in lock task mode" into pi-dev