* commit '421fa2744556d6483007bc2a6a1e4030811142f9': Fix issue #5418999: [From My Phone] - ANR when navigating back from OneUp view
* commit '421fa2744556d6483007bc2a6a1e4030811142f9': Fix issue #5418999: [From My Phone] - ANR when navigating back from OneUp view