Merge changes I5b4a87d6,I131315d4

* changes:
  fs_mgr: overlayfs: test: if wait_for_screen times out, skip later
  fs_mgr: remount: add -v option