Merge "Enable Back during setup wizard" into jb-mr2-dev