Merge "Map new home and back keyboard shortcuts"