Merge "Don't disable "Done" button when it cannot be pressed" into main