Merge changes Ibf5f349c,Ie46d630d into sc-dev

* changes:
  Update owner info with other keyguard indications
  Add test to allow icon-only messages