Merge "Fix crash on calling getAppStandbyBucket()" into pi-dev