Merge "Make PeopleActivity retain task state (AOSP)"

        <activity android:name=".activities.PeopleActivity"

            android:label="@string/launcherActivityLabel"

            android:theme="@style/PeopleActivityTheme"

            android:clearTaskOnLaunch="true"

            android:alwaysRetainTaskState="true"

            android:launchMode="singleTop"

            android:resizeableActivity="true"

        >