Merge "Fix a couple of issues with mOpeningApps." into klp-dev