Merge "Show USB flash drive in storage spinner when it's unmounted" into tm-dev