Merge "Change FLAG_FORWARD_LOCK back to its original value to not break things." into honeycomb