Merge "DO NOT MERGE Defer VVM activation/deactivation until device is unlocked." into nyc-dev