Merge "Fix back gesture / keycode for the PlatLogoActivity" into udc-dev