Merge "Fix the settings app launch animation" into sc-dev

        <item android:id="@android:id/mask">

            <shape android:shape="rectangle">

                <solid android:color="@android:color/white"/>

                <corners android:radius="@dimen/screenshot_button_corner_radius"/>

                <corners android:radius="@dimen/qs_footer_action_corner_radius"/>

            </shape>

        </item>

        <item>