Merge "bliss: Add a flag to the blissify function for PixelGapps users" into typhoon-qpr2