Fix orientation sometimes getting stuck in current orientation after unlock

While we are locked the display_.rotation() can get out of sync with the
actual device orientation, so we need to find the best orientation given
the actual orientation, not the old one.
Merge pull request #1486 from kenchris/stuck

Fix orientation sometimes getting stuck in current orientation after unlock