Merge "RESTRICT AUTOMERGE Use consistent calling uid and package in navigateUpTo" into qt-dev am: 672530b42e

Change-Id: Ib2be8ddd2e5f708d86da136b32557382f5d16fee