Merge "renaming Sleep Mode feature." into jb-mr1-dev