Merge "Revert "Revert "Only update default home when the preferred home activity is modified.""" into sc-dev