Merge "Don't notify of changes to non-VFS state for inactive devices"