Merge "Filter-Diff Screen Layout Changes for Activity Relaunch" into sc-v2-dev