Re-enable resource policy handling and hardware keys support