Merge "Limit default capabilities to Android B+" into main