Fixed a bug where 'Back' button wasn't activated at time
Merge branch 'develop' into integrate_scanner_gtkapplication