Merge "Always update overlay paths of newly added apps" into sc-dev