Merge "Makes iterator internal in NanoAppStateManager"