Merge "Add support for changing status widget on security screen" into jb-mr1-dev