Merge "Fix bug where All Apps wasn't always getting updated"