Merge "Do not animate NSSL when in battery saver"