Merge "Use less steps for home gesture"