Merge "Fix crash when change language during true scanner"

        <activity

            android:name="com.android.gallery3d.filtershow.FilterShowActivity"

            android:theme="@style/Theme.FilterShow"

            android:configChanges="keyboardHidden|orientation|screenSize|layoutDirection">

            android:configChanges="keyboardHidden|orientation|screenSize|locale|layoutDirection">

            <intent-filter>

                <action android:name="android.intent.action.EDIT" />

                <category android:name="android.intent.category.DEFAULT" />