Merge "Refactor theme attr" into qt-dev