Merge "Fix logic for power button overridding the "wait for prox negative state" after a call"