[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: b874aade am: 73158d26 -s ours

am skip reason: subject contains skip directive

Change-Id: I093df309df0b6cb991e19aa3c60a7e92f634255e