Merge "Default to not showing lock regions"