Merge "Fix widget tray crash on screen rotation introduced by ag/694693" into ub-launcher3-burnaby