Fix potential issue with the Up affordance on previous Android version. TODO: clean code