Merge "Allow developer options in retail mode" into pi-dev