Merge "Support non-default back-disposition in ThemedNavBarKeyboard"