Merge "Fixed a bug updating presentation displays." into klp-dev