set back button hide and unhide
merge master to develop