Merge "[Hotseat] Fix legacy shortcut with config activity drawing on top of predicted app" into sc-v2-dev