Merge v2.0.1 back into dev#4001

jjw24 merged 3 commits intodevFlow-Launcher/Flow.Launcher:devfrom

merge_back_v2_0_1Flow-Launcher/Flow.Launcher:merge_back_v2_0_1Copy head branch name to clipboard