Merge "Block directory selection in openable modes." into mnc-dr-dev