Lock DisplayActivity to same orientation as MainActivity, ensure only one of landscape/portrait locking in place

This fixes a bug in the previous commit (line 135 in MainActivity), where I needed to ensure that only one of lockToPortrait/lockToLandscape gets called