Merge "Add activity state check to minimizeDesktopApp" into main