Merge "Add disable2 flag for rotate suggestions" into pi-dev