Merge "Added setprop to go back after gesture end"