Merge "Update dismiss view location in one-handed mode" into main