Merge "AppsOnSd feature - Add default container"