[automerger skipped] Merge "RESTRICT AUTOMERGE Use consistent calling uid and package in navigateUpTo" into qt-dev am: 672530b4 am: 4a1b488d -s ours am: 348b330f am: d00666b9 am: 7d6138d5 am: e7343314 am: fce97e6b -s ours

am skip reason: subject contains skip directive

Change-Id: I07ab0077f6fdae4400ebcf518f36866edd65dfca