Merge "b/2370089 Pop the dock dialog above the keyguard" into eclair