Merge "Adds owners to shortcuts related classes in framework"