Merge "Don't store Launcher as a class variable in CellLayout" into sc-dev