Merge "Revert app freeze timeout delay." into jb-mr1-dev