Merge "Ensure default folders and Camera folders are always visible" into rvc-qpr-dev