Merge "Put edge panels from prototype below ime on keyguard"