Merge "Fix one-handed mode tap app to exit doesn't work in factory boot" into sc-dev