Merge "Add scroll view for choose_lock_pattern in land mode"