master
Updates to correlate with tutorial review cr/138026431.
Updated to ensure the map retains state on destruction of the fragment.