Merge "Set the original drawable for floating widget view" into tm-qpr-dev