Merge changes from topic "b150393918-lock-icon-controller" into rvc-dev am: 831ddd860f

Change-Id: Iec745f6b05722d68424c8346d046d9b1cbcbde77