Merge "Update cache key calculation for statusbar insets" into tm-dev