Merge changes I955f9dfa,Ibfbb9d67 into nyc-mr1-dev

* changes:
  Only show optimizing storage dialog if dex opt dialog was shown
  Only do slow unlock transition if real home is not running