Merge "Allow activity view to be max height" into qt-r1-bubbles-dev