Merge "Fix activities appearing behind home icons"