Merge "DO NOT MERGE: Introduce DPMS shim for active DO/PO check"