Merge "Change app ops state timeouts to elapsed realtime"