Merge "Respect timeout multiplier in PermissionControllerManager"