Merge "screen-off animation won't be handled by SF anymore" into jb-mr1-dev