Merge "Check user unlocked before write to /data/system_ce/0/snapshots" into rvc-dev