Merge "Refactor DPMS security check"