Merge "Block subdirs of Android for SAF and normalize the path" into tm-dev