Merge "Fix home activity and user switch interactions."