Merge "Fix the overlay consuming KEYCODE_BACK" into sc-dev