Merge "Add the "Smart Lock" item to dynamic index." into rvc-dev