Merge "Avoiding horizontal keypad navigation trapping within gallery."