am 840590dd: Merge "Fix issue #7311376: Add API to allow apps to know if they are..." into jb-mr1-dev

* commit '840590dd642719f402491092944a12475d6d6a8e':
  Fix issue #7311376: Add API to allow apps to know if they are...