Merge "Add maintainer for HTC U Ultra"