Merge "DO NOT MERGE Do not call RecoverySystem with DPMS lock held" into lmp-dev