Adding support for back button
Merge branch 'back_button_support' into yinsi