Merge "Wake up screen when phone call ends." into klp-dev