Merge "Allow phone to enter suspend with positive proximity." into klp-dev