Merge "Refacotr mobile data observer for repository" into 24D1-dev