Merge "Block directory selection in openable modes." into mnc-dr-dev am: 00765ef5a2 am: e6538dcc06 am: d9c10d7edd
am: ab62877a07  -s ours

* commit 'ab62877a077376bccb1230f1ab4a22c41441d2d9':
  Block directory selection in openable modes.