Merge "Adding a utility class for listening disable rotation changes" into pi-dev