Merge "Folder Title Change Listener" into 24D1-dev