Merge "Fix floating action button" into qt-dev