Merge "Fix: unnecessary shortcut data and observer setup" into main