Merge "Fix device not locking properly on power press"