Merge "Fixing Launcher crases due to methods being called on Ui Threads." into main