Merge changes from topics "cursor_type_hotspot", "set_viewport_in_input_reader" am: 43beafe0b0

Change-Id: Ib3930377b494bf7bafce339165dff428a30563b6