merge "Remove "Go Back" option from verify root and recovery options"
merge "Fix potential chmod failures"