Merge "Reset visible entries when the app tile of the same app no longer match" into sc-dev