Merge "Introduce boolean flag to show/hide Reset Options." into pi-dev