Merge "Add owners to the Shell app"