diff --git a/onebusaway-android/src/main/AndroidManifest.xml b/onebusaway-android/src/main/AndroidManifest.xml
index 98ace5da4..79f7d7456 100644
--- a/onebusaway-android/src/main/AndroidManifest.xml
+++ b/onebusaway-android/src/main/AndroidManifest.xml
@@ -63,7 +63,8 @@
         <activity
             android:name="org.onebusaway.android.ui.SearchActivity"
             android:launchMode="singleTop"
-            android:exported="true">
+            android:exported="true"
+            android:configChanges="orientation|keyboardHidden|screenSize">
             <intent-filter>
                 <action android:name="android.intent.action.SEARCH" />
             </intent-filter>
@@ -73,43 +74,49 @@
         </activity>
 
         <activity
-                android:name="org.onebusaway.android.ui.HomeActivity"
-            android:exported="true">
+            android:name="org.onebusaway.android.ui.HomeActivity"
+            android:exported="true"
+            android:configChanges="orientation|keyboardHidden|screenSize">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
                 <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </activity>
         <activity
-                android:name="org.onebusaway.android.ui.ArrivalsListActivity"
-                android:launchMode="singleTop"
-            android:exported="true">
+            android:name="org.onebusaway.android.ui.ArrivalsListActivity"
+            android:launchMode="singleTop"
+            android:exported="true"
+            android:configChanges="orientation|keyboardHidden|screenSize">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
             </intent-filter>
         </activity>
         <activity
-                android:name="com.joulespersecond.seattlebusbot.ArrivalsListActivity"
-                android:launchMode="singleTop"
-            android:exported="true">
+            android:name="com.joulespersecond.seattlebusbot.ArrivalsListActivity"
+            android:launchMode="singleTop"
+            android:exported="true"
+            android:configChanges="orientation|keyboardHidden|screenSize">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
             </intent-filter>
         </activity>
         <activity android:name="org.onebusaway.android.ui.StopInfoActivity"
-            android:exported="true">
+            android:exported="true"
+            android:configChanges="orientation|keyboardHidden|screenSize">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
             </intent-filter>
         </activity>
         <activity android:name="org.onebusaway.android.ui.RouteInfoActivity"
-            android:exported="true">
+            android:exported="true"
+            android:configChanges="orientation|keyboardHidden|screenSize">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
             </intent-filter>
         </activity>
         <activity android:name="com.joulespersecond.seattlebusbot.RouteInfoActivity"
-            android:exported="true">
+            android:exported="true"
+            android:configChanges="orientation|keyboardHidden|screenSize">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
             </intent-filter>
@@ -117,16 +124,18 @@
         <activity android:name="org.onebusaway.android.ui.TripInfoActivity"/>
         <activity android:name=".ui.MyRemindersActivity"/>
         <activity android:name="org.onebusaway.android.ui.TripDetailsActivity"
-            android:exported="true">
+            android:exported="true"
+            android:configChanges="orientation|keyboardHidden|screenSize">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
             </intent-filter>
         </activity>
 
         <activity
-                android:name="org.onebusaway.android.ui.MyStopsActivity"
-                android:label="@string/stop_shortcut"
-            android:exported="true">
+            android:name="org.onebusaway.android.ui.MyStopsActivity"
+            android:label="@string/stop_shortcut"
+            android:exported="true"
+            android:configChanges="orientation|keyboardHidden|screenSize">
             <intent-filter>
                 <action android:name="android.intent.action.CREATE_SHORTCUT"/>
                 <category android:name="android.intent.category.DEFAULT"/>
@@ -134,52 +143,58 @@
         </activity>
 
         <activity
-                android:name="com.joulespersecond.seattlebusbot.MyStopsActivity"
-                android:label="@string/stop_shortcut"
-            android:exported="true">
+            android:name="com.joulespersecond.seattlebusbot.MyStopsActivity"
+            android:label="@string/stop_shortcut"
+            android:exported="true"
+            android:configChanges="orientation|keyboardHidden|screenSize">
             <intent-filter>
                 <action android:name="android.intent.action.CREATE_SHORTCUT"/>
             </intent-filter>
         </activity>
         <activity
-                android:name="org.onebusaway.android.ui.MyRecentStopsActivity"
-                android:label="@string/recent_stops_shortcut"
-            android:exported="true">
+            android:name="org.onebusaway.android.ui.MyRecentStopsActivity"
+            android:label="@string/recent_stops_shortcut"
+            android:exported="true"
+            android:configChanges="orientation|keyboardHidden|screenSize">
             <intent-filter>
                 <action android:name="android.intent.action.CREATE_SHORTCUT"/>
                 <category android:name="android.intent.category.DEFAULT"/>
             </intent-filter>
         </activity>
         <activity
-                android:name="org.onebusaway.android.ui.MyStarredStopsActivity"
-                android:label="@string/starred_stops_shortcut"
-            android:exported="true">
+            android:name="org.onebusaway.android.ui.MyStarredStopsActivity"
+            android:label="@string/starred_stops_shortcut"
+            android:exported="true"
+            android:configChanges="orientation|keyboardHidden|screenSize">
             <intent-filter>
                 <action android:name="android.intent.action.CREATE_SHORTCUT"/>
                 <category android:name="android.intent.category.DEFAULT"/>
             </intent-filter>
         </activity>
         <activity
-                android:name="org.onebusaway.android.ui.MyRoutesActivity"
-                android:label="@string/route_shortcut"
-            android:exported="true">
+            android:name="org.onebusaway.android.ui.MyRoutesActivity"
+            android:label="@string/route_shortcut"
+            android:exported="true"
+            android:configChanges="orientation|keyboardHidden|screenSize">
             <intent-filter>
                 <action android:name="android.intent.action.CREATE_SHORTCUT"/>
                 <category android:name="android.intent.category.DEFAULT"/>
             </intent-filter>
         </activity>
         <activity
-                android:name="com.joulespersecond.seattlebusbot.MyRoutesActivity"
-                android:label="@string/route_shortcut"
-            android:exported="true">
+            android:name="com.joulespersecond.seattlebusbot.MyRoutesActivity"
+            android:label="@string/route_shortcut"
+            android:exported="true"
+            android:configChanges="orientation|keyboardHidden|screenSize">
             <intent-filter>
                 <action android:name="android.intent.action.CREATE_SHORTCUT"/>
             </intent-filter>
         </activity>
         <activity
-                android:name="org.onebusaway.android.ui.MyRecentRoutesActivity"
-                android:label="@string/recent_routes_shortcut"
-            android:exported="true">
+            android:name="org.onebusaway.android.ui.MyRecentRoutesActivity"
+            android:label="@string/recent_routes_shortcut"
+            android:exported="true"
+            android:configChanges="orientation|keyboardHidden|screenSize">
             <intent-filter>
                 <action android:name="android.intent.action.CREATE_SHORTCUT"/>
                 <category android:name="android.intent.category.DEFAULT"/>
@@ -187,8 +202,8 @@
         </activity>
         <!-- ActionBarCompat library doesn't have an ActionBarPreferenceActivity, so define parent here-->
         <activity
-                android:name="org.onebusaway.android.ui.PreferencesActivity"
-                android:parentActivityName="org.onebusaway.android.ui.HomeActivity">
+            android:name="org.onebusaway.android.ui.PreferencesActivity"
+            android:parentActivityName="org.onebusaway.android.ui.HomeActivity">
             <meta-data
                     android:name="android.support.PARENT_ACTIVITY"
                     android:value="org.onebusaway.android.ui.HomeActivity"/>
@@ -200,10 +215,11 @@
         <activity android:name="org.onebusaway.android.report.ui.InfrastructureIssueActivity"/>
 
         <activity
-                android:name="org.onebusaway.android.ui.MyRecentStopsAndRoutesActivity"
-                android:label="@string/my_recent_title"
-                android:parentActivityName="org.onebusaway.android.ui.HomeActivity"
-            android:exported="true">
+            android:name="org.onebusaway.android.ui.MyRecentStopsAndRoutesActivity"
+            android:label="@string/my_recent_title"
+            android:parentActivityName="org.onebusaway.android.ui.HomeActivity"
+            android:exported="true"
+            android:configChanges="orientation|keyboardHidden|screenSize">
             <intent-filter>
                 <action android:name="android.intent.action.CREATE_SHORTCUT"/>
                 <category android:name="android.intent.category.DEFAULT"/>
@@ -214,11 +230,12 @@
                     android:value="org.onebusaway.android.ui.HomeActivity"/>
         </activity>
         <activity
-                android:name="org.onebusaway.android.ui.NightLightActivity"
-                android:label="@string/stop_info_option_night_light"
-                android:parentActivityName="org.onebusaway.android.ui.HomeActivity"
-                android:screenOrientation="portrait"
-            android:exported="true">
+            android:name="org.onebusaway.android.ui.NightLightActivity"
+            android:label="@string/stop_info_option_night_light"
+            android:parentActivityName="org.onebusaway.android.ui.HomeActivity"
+            android:screenOrientation="portrait"
+            android:exported="true"
+            android:configChanges="orientation|keyboardHidden|screenSize">
             <intent-filter>
                 <action android:name="android.intent.action.CREATE_SHORTCUT"/>
                 <category android:name="android.intent.category.DEFAULT"/>
@@ -229,9 +246,9 @@
                     android:value="org.onebusaway.android.ui.HomeActivity"/>
         </activity>
         <activity
-                android:name="org.onebusaway.android.ui.TripPlanActivity"
-                android:label="@string/title_activity_trip_plan"
-                android:parentActivityName="org.onebusaway.android.ui.HomeActivity">
+            android:name="org.onebusaway.android.ui.TripPlanActivity"
+            android:label="@string/title_activity_trip_plan"
+            android:parentActivityName="org.onebusaway.android.ui.HomeActivity">
             <meta-data
                     android:name="android.support.PARENT_ACTIVITY"
                     android:value="org.onebusaway.android.ui.HomeActivity"/>
@@ -253,8 +270,8 @@
                 android:authorities="${databaseAuthority}"/>
 
         <service
-                android:name=".tripservice.TripService"
-                android:permission="${applicationId}.permission.TRIP_SERVICE"
+            android:name=".tripservice.TripService"
+            android:permission="${applicationId}.permission.TRIP_SERVICE"
             android:exported="true">
             <intent-filter>
                 <action android:name="${applicationId}.AlarmReceiver"/>
@@ -263,7 +280,7 @@
         </service>
 
         <service
-                android:name=".directions.realtime.RealtimeService">
+            android:name=".directions.realtime.RealtimeService">
         </service>
 
         <service