Merge "Disabling auto addition of managed profile shortcuts" into ub-now-queens