Merge "Reset IMMS when the device is unlocked." into nyc-dev