Support Android 5.0 behavior changes