Merge "Use separate color for popup when on top of another surface (folder/all apps)." into sc-dev