Merge "Fix NPE in bluetooth Permission Activity" into jb-mr1-dev