Merge "Update shelf offset earlier when in gesture nav" into ub-launcher3-rvc-dev am: 054b0ae358

Change-Id: I87925bb3e54d74c08ea35d748b207af7f30dc780