Merge "Dont select automatic strategy when stylus is in use" into main