Merge "Adjusting Launcher grid, issue 5067941"