Merge "Exempt PRE_BOOT_COMPLETED from timeout & deferral policy"