Merge "Prevent false touch when folding device (2/2)"