Merge "Fix bug where transport shows all the time in keyguard" into jb-mr2-dev