Merge changes Ibf005251,I8a2d9cf9 into main

* changes:
  Add logic for lock icon.
  Add notification section logic