Merge "Adding support for new APIs in O related to configurable shortcuts" into ub-launcher3-master