Merge v2.1.0 back to dev#4292

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

merge_2_1_0Flow-Launcher/Flow.Launcher:merge_2_1_0Copy head branch name to clipboard