Merge "Handle back shortcuts in native and remove home shortcut handling" into udc-dev