Merge "Set launcher state to NORMAL when entering desktop" into tm-qpr-dev