Merge "Recreate resources after blur is deactivated." into devel/master