Merge "Use getFlashLockState API to check lock state" into nyc-dev