Merge "Fixed clipboard disappearing issue on selection" into devel/master